Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick commits which went missing from what was matrix-doc #1052

Merged
merged 8 commits into from
May 9, 2022

Conversation

turt2live
Copy link
Member

Using PR for CI check: not planning to get proper review on this.

Using matrix-spec-proposals (matrix-doc) as origin:

$ git log --oneline remotes/matrix-spec/main...main --not remotes/matrix-spec/main
ffc689db (HEAD -> main, origin/main, origin/HEAD) Add an unstable room version to MSC2174 (#3788)
ebd57df4 Add MSC2176's undocumented unstable room version (#3789)
7521fea3 Clarify serialization properties of the latest thread event. (#3785)
2a9e2330 Pull request templates (#3777)
533e6c5e CONTRIBTUTING: missing paren
ac93bec5 README and CONTRIBUTING (#3776)
8aaf3c51 MSC3383: Include destination in X-Matrix Auth Header (#3383)
919ca2f6 MSC3666: Bundled aggregations for server side search (#3666)
d375720b MSC3700: Deprecate plaintext sender key (#3700)
e1aa00a7 Fix numbering
03f8ce9c MSC3667: Enforce integer power levels (#3667)
32ce5893 Put back Typos CI (#3753)
489f8d85 MSC3440: Threading via `m.thread` relation (#3440)
daf940a1 MSC3316: Add timestamp massaging to the spec (#3316)
161be7e7 remove github magic irrelevant to matrix-spec-proposals
b655688d Remove content unrelated to proposals
b26aa7fc Remove 'room_id' field from `m.typing`, `m.receipt` and `m.fully_read` examples and schema (#3679)
419d8cbd Update the default room version to 9 (#3739)
2e63733b Remove unenforced size limit on room names (#3669)
d7d52e80 Fix broken link in end_to_end_encryption.md (#3708)
1afbffb9 ✨ Warn of untagged operations (#3699)
be3b8e3a Fix join membership auth rules when `join_rule` is knock (#3737)
7afac76e Fix membership state table and diagram (#3730)
23b0e114 MSC3589: Room version 9 as the default room version (#3589)
e9fed105 MSC3582: Remove m.room.message.feedback (#3582)
8851974d Another changelog fix (#3731)
8a0a799a Clarify that the X-Matrix validation uses the parsed request body (#3727)
9e4b1706 Skip building the docs site for MSCs (#3729)
7aeea647 Fix location of some changelogs (#3728)

Many of these relate to proposals so should not really be carried over.

turt2live and others added 8 commits May 9, 2022 01:20
* Fix membership state table and diagram

There were 2 missing cases which are legal:
* `invite->knock` (a fairly silly thing to do, but legal under the auth rules)
* `external->leave (via /kick)` (another somewhat silly thing to do, but no different than `external->ban (via /ban)`)

The state table considered the first as illegal, which is untrue.

* Changelog

* Make the graph prettier

* Update changelogs/client_server/newsfragments/3730.clarification

Co-authored-by: Richard van der Hoff <[email protected]>

Co-authored-by: Richard van der Hoff <[email protected]>
Signed-off-by: Alexandre Franke <[email protected]>

Co-authored-by: Alexandre Franke <[email protected]>
Fixes #3641

The spec says the name field in m.room.name events must not exceed 255 bytes but no servers actually enforce this over the C-S API. Clients should probably already be truncating room names to an appropriate length for their user interface.

Signed-off-by: Aaron Raimist <[email protected]>
* Update the default room version to 9

Spec PR for [MSC3589](matrix-org/matrix-spec-proposals#3589)

Signed-off-by: Aaron Raimist <[email protected]>

* Add changelog

Signed-off-by: Aaron Raimist <[email protected]>
…` examples and schema (#3679)

The spec had an erroneous `room_id` field in a m.typing EDU entry of /sync, `m.read` receipts in `/sync`, and `m.fully_read` room account data objects in the spec. None of these are necessary nor used in practice.

Checking part of the ecosystem for whether clients look for, or homeservers include, these room_id fields, I found that:

    Element does not require them, nor does Synapse include them.
    Ruma does not include them.
    Dendrite does not include them.
    nheko/mtxclient does not look for them.

This change removes room_id from the example and OpenAPI schema in each case mentioned above. It only affects the Client-Server spec - the Server-Server spec text remains unchanged.

The field was initially introduced in 0f28f83.
@turt2live turt2live requested a review from a team as a code owner May 9, 2022 07:26
@turt2live turt2live merged commit 8a5955e into main May 9, 2022
@turt2live turt2live deleted the travis/fix-main-split branch May 9, 2022 07:28
@richvdh
Copy link
Member

richvdh commented May 16, 2022

This relates to when we split https://github.com/matrix-org/matrix-doc into https://github.com/matrix-org/matrix-spec and https://github.com/matrix-org/matrix-spec-proposals (cf #927).

It appears I used a stale copy of the repository when I populated the new matrix-spec repository :(. Sorry, and thanks to @turt2live for fixing it up.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants